Imagine I have two branches, one of which has been set up to track one remote-tracking branch and another which has similarly been set up to track a different remote-tracking branch. Now, let's say I merge these two branches together into a single branch. How would such a merger affect the resulting branch's connectivity? Would the resulting branch still be able to track both of the remote-tracking branches which were tracked by its un-merged predecessors, or would one remote-tracking branch no longer be tracked by my new, merged branch?
Results of Merging Two Different Tracking Branches?
355 Views Asked by RandomDSdevel At
1
There are 1 best solutions below
Related Questions in GIT
- Push mysql database script to server using git
- Git show's file path
- Git > diffs filtered, show only certain changed classes/files
- Pushing to git repository hosted by Visual studio online without entering user name and password
- How do I create my own Git branch to work on?
- Git init --bare giving error fatal: Out of memory? mmap failed: No such device
- Sub-directory into independent repository and later merge back into main repository
- How to find the Git Revision Hash in a synced SVN repo using SubGit?
- eclipse errors when try to change to master git branch
- How to have Heroku build my development branch on a staging server?
- Is "Merged in" a commit message created by bitbucket, or git?
- Git: Multiple projects under one directory
- Permission denied hg-git
- Is it possible to clone a private git repo without adding ssh keys
- Track file in master repository which is ignored in submodule
Related Questions in GIT-BRANCH
- Tools for Apache Cordova - Installed Plugins are skipped in build
- git branch on another server
- Git: how to commit and cherry-pick bug fix?
- git push to remote, but don't create new branch
- Is it possible to rename an entire “directory of branches”?
- GitLab shows deleted branches
- Multiple streams over single project in Git?
- Git Command for a custom purpose
- How to create a new git branch from a messy working copy?
- Can I check out a git branch without removing other orphaned branches from my local files?
- Create branch afterwards, apply tags and use specific commit for both branches
- how to create multi-level remote branch in git?
- Compare committed revision with server one for the same branch
- How to import bugfix of master in all other branches without including the commits before?
- Advantages/disadvantages to branches and forks
Related Questions in GIT-MERGE
- How to determine if Git merge is in process
- How to list merge conflicts on origin that are not on local?
- Feature branch with or without fast-forward merge?
- merge master into subtree branches
- GIT HOOK to check keyword "PROMOTE" in message when GIT MERGE is executed
- hint: after resolving the conflicts, mark the corrected paths
- git auto-merge does not work as expected
- Git: Merging very large master branch with a feature branch
- Include (realign) some branch changes into other branch
- Git - coworker somehow overwrote my entire commit while resolving a conflict
- How can a revert commit also be a merge commit?
- git cant resolve rebase conflicts as mergetool doesnt pop up
- Merge git repositories with different base dir
- Why does 'git merge' add files ending with tilde?
- Git Merge Specifics Commits
Related Questions in GIT-REMOTE
- git branch on another server
- Updating a remote server to pull from a renamed Git repo
- How to list remote branch without web request?
- Syncing one remote git repo with other
- Git won't see remote merge
- Clean remotes/origin/master branch after deleting remote repository
- Visual Studio 2013 Configure Remote Git Repo
- How to pull only one branch from remote?
- How do I add existing remote branch to my locally cloned repository?
- Which characters are illegal within a git remote name?
- How to delete/change the remote origin master branch
- Git - fetch changes made to files on remote
- How to merge a branch from one remote to the origin/master
- git branch -r vs git remote show origin
- Results of Merging a Branch Tracking a Remote with a Branch Containing a Submodule?
Trending Questions
- UIImageView Frame Doesn't Reflect Constraints
- Is it possible to use adb commands to click on a view by finding its ID?
- How to create a new web character symbol recognizable by html/javascript?
- Why isn't my CSS3 animation smooth in Google Chrome (but very smooth on other browsers)?
- Heap Gives Page Fault
- Connect ffmpeg to Visual Studio 2008
- Both Object- and ValueAnimator jumps when Duration is set above API LvL 24
- How to avoid default initialization of objects in std::vector?
- second argument of the command line arguments in a format other than char** argv or char* argv[]
- How to improve efficiency of algorithm which generates next lexicographic permutation?
- Navigating to the another actvity app getting crash in android
- How to read the particular message format in android and store in sqlite database?
- Resetting inventory status after order is cancelled
- Efficiently compute powers of X in SSE/AVX
- Insert into an external database using ajax and php : POST 500 (Internal Server Error)
Popular Questions
- How do I undo the most recent local commits in Git?
- How can I remove a specific item from an array in JavaScript?
- How do I delete a Git branch locally and remotely?
- Find all files containing a specific text (string) on Linux?
- How do I revert a Git repository to a previous commit?
- How do I create an HTML button that acts like a link?
- How do I check out a remote Git branch?
- How do I force "git pull" to overwrite local files?
- How do I list all files of a directory?
- How to check whether a string contains a substring in JavaScript?
- How do I redirect to another webpage?
- How can I iterate over rows in a Pandas DataFrame?
- How do I convert a String to an int in Java?
- Does Python have a string 'contains' substring method?
- How do I check if a string contains a specific word?
They get merged. Nothing else happens. Tracking isn't affected by
git merge. If you made a new branch, not tracking anything, and merged both into it, it still won't be tracking anything. If you merged one branch into another, the branch you merged into will still be tracking the same thing it was before.