Say you and your friend both checked out a file, and made some changes to it. You removed a line at the beginning, and your friend added a line at the end. Then he committed his file, and you need to merge his changes into your copy. If you were doing a two-way merge (in … Read more
There is a better answer to this problem, though I could just break this down step-by-step. You will need to fetch and checkout the latest upstream changes like so, e.g.: git fetch upstream git checkout upstream/master -b revert/john/foo_and_bar Taking a look at the commit log, you should find something similar to this: commit b76a5f1f5d3b323679e466a1a1d5f93c8828b269 Merge: … Read more
You can override any checks that git does by using “force push”. Use this command in terminal git push -f origin master However, you will potentially ignore the existing work that is in remote – you are effectively rewriting the remote’s history to be exactly like your local copy.
With VSCode you can find the merge conflicts easily with the following UI. (if you do not have the topbar, set “editor.codeLens”: true in User Preferences) It indicates the current change that you have and incoming change from the server. This makes it easy to resolve the conflicts – just press the buttons above <<<< … Read more
I think the commands you are looking for are: cd repo2 git checkout master git remote add r1remote **url-of-repo1** git fetch r1remote git merge r1remote/master –allow-unrelated-histories git remote rm r1remote After that repo2/master will contain everything from repo2/master and repo1/master, and will also have the history of both of them.
There are two options here. One is to do an interactive rebase and edit the merge commit, redo the merge manually and continue the rebase. Another is to use the –rebase-merges option on git rebase, which is described as follows from the manual: By default, a rebase will simply drop merge commits from the todo … Read more
One way is to just leave merged feature branches open (and inactive): $ hg up default $ hg merge feature-x $ hg ci -m merge $ hg heads (1 head) $ hg branches default 43:… feature-x 41:… (2 branches) $ hg branches -a default 43:… (1 branch) Another way is to close a feature branch … Read more
You can as well do: git checkout –theirs /path/to/file to keep the remote file, and: git checkout –ours /path/to/file to keep local file. Then git add them and everything is done. Edition: Keep in mind that this is for a merge scenario. During a rebase –theirs refers to the branch where you’ve been working.
If I understood your question, you want to merge branchB into branchA. To do so, first checkout branchA like below, git checkout branchA Then execute the below command to merge branchB into branchA: git merge branchB
git diff `git merge-base master branch`..branch Merge base is the point where branch diverged from master. Git diff supports a special syntax for this: git diff master…branch You must not swap the sides because then you would get the other branch. You want to know what changed in branch since it diverged from master, not … Read more