Yes, just do: git checkout master git pull git checkout mobiledevicesupport git merge master to keep mobiledevicesupport in sync with master. Then, when you’re ready to put mobiledevicesupport into master, first, merge in master like above, then: git checkout master git merge mobiledevicesupport git push origin master and that’s it. The assumption here is that … Read more
When there is a conflict during a merge, you have to finish the merge commit manually. It sounds like you’ve done the first two steps, to edit the files that conflicted and then run git add on them to mark them as resolved. Finally, you need to actually commit the merge with git commit. At … Read more
I’m not familiar with resolve, but I’ve used the others: Recursive Recursive is the default for non-fast-forward merges. We’re all familiar with that one. Octopus I’ve used octopus when I’ve had several trees that needed to be merged. You see this in larger projects where many branches have had independent development and it’s all ready … Read more
git log ..otherbranch list of changes that will be merged into current branch. git diff …otherbranch diff from common ancestor (merge base) to the head of what will be merged. Note the three dots, which have a special meaning compared to two dots (see below). gitk …otherbranch graphical representation of the branches since they were … Read more
Sure, being in master branch all you need to do is: git merge <commit-id> where commit-id is hash of the last commit from newbranch that you want to get in your master branch. You can find out more about any git command by doing git help <command>. It that case it’s git help merge. And … Read more
Probably the simplest way would be to pull the XXX stuff into a branch in YYY and then merge it into master: In YYY: git remote add other /path/to/XXX git fetch other git checkout -b ZZZ other/master mkdir ZZZ git mv stuff ZZZ/stuff # repeat as necessary for each file/dir git commit -m “Moved stuff … Read more
Fast-forward merging makes sense for short-lived branches, but in a more complex history, non-fast-forward merging may make the history easier to understand, and make it easier to revert a group of commits. Warning: Non-fast-forwarding has potential side effects as well. Please review https://sandofsky.com/blog/git-workflow.html, avoid the ‘no-ff’ with its “checkpoint commits” that break bisect or blame, … Read more
Suppose originally there were 3 commits, A,B,C: Then developer Dan created commit D, and developer Ed created commit E: Obviously, this conflict should be resolved somehow. For this, there are 2 ways: MERGE: Both commits D and E are still here, but we create merge commit M that inherits changes from both D and E. … Read more
The problem is that you are not tracking the files locally but identical files are tracked remotely so in order to “pull” your system would be forced to overwrite the local files which are not version controlled. Try running git add * git stash git pull This will track all files, remove all of your … Read more
It’s not a Git error message, it’s the editor as git uses your default editor. To solve this: press “i” (i for insert) write your merge message press “esc” (escape) write “:wq” (write & quit) then press enter