Skip to main content

All Questions

Tagged with
Filter by
Sorted by
Tagged with
1 vote
1 answer
54 views

How do I stash manual resolutions from an uncommitted git merge for later?

I'm attempting to merge a long-standing branch, and not surprisingly, there's a fair number of merge conflicts which need to get resolved. I've worked through a fair number of them, git-add-ing each ...
R.M.'s user avatar
  • 3,643
5 votes
4 answers
2k views

What are the conceptual differences between Merging, Stashing and Rebasing in Git?

I have been using Merging heavily on master branch. But recently for a feature development in my situation merging seemed complicated for the project history. I came across Rebasing which solves my ...
Syed Priom's user avatar
  • 2,007
0 votes
1 answer
772 views

Why git pull won't/can't merge local changes?

Trying to understand git behavior. When I execute git pull I get a warning error: Your local changes to the following files would be overwritten by merge: foo/bar Please, commit your changes ...
Chaim Geretz's user avatar
1 vote
1 answer
114 views

Missing some variable declaration in java file when git Merge with another branch

I have two git branches and I merged these two branches together. One of the java class , some variable declarations are missing . A branch class Cal { int x =10 ; int y = 20 ; public void m(){ ...
Harsha's user avatar
  • 13
20 votes
1 answer
3k views

Can I git stash a merge in progress?

I'm in the middle of resolving conflicts for a git merge, but I want to get back to a clean state temporarily without losing the work I've already done on the merge. If I try to git stash, I get ...
Russ's user avatar
  • 1,951
3 votes
1 answer
6k views

Git command error

I have updated files in my local instance and my git have 3 days old files. So i want to commit my changes for that i done following command to merge changes in git and my local instance Sudo git ...
user3755198's user avatar
6 votes
3 answers
2k views

Can I influence the merge strategy used by "recursive" when applying a git stash?

I have a set of debug utilities living in a git stash slot; I'm moving between branches which differ only very slightly regarding the changes in the stash. I git stash apply the top stash on the ...
bitmask's user avatar
  • 34.5k
1 vote
1 answer
121 views

Git conflicted files

I am having a problem with git merge / rebase and even stash, let me explain what is happening: Situation: I and other friend, we are working in separate branches, but we have a file that we always ...
Diego Gusava's user avatar
34 votes
6 answers
20k views

`git stash` during a merge conflict

We've done something bad. We ran git stash save during a merge conflict, and now we can't restore our work. Things we've tried: git pull -Xours origin master git stash apply --index And: git ...
steven_moy's user avatar