Questions tagged [rebase]
Changing the starting point of a branch in a Version Control System.
rebase
2,238
questions
0
votes
2
answers
41
views
How can you rebase a branch that is tracked remotely?
We've got a development branch, dev1. Starting from that, I create a feature branch, f1 and push to our git server:
git checkout -b f1
git push -u origin f1
I make some changes, commit them and push ...
- 1,446
-2
votes
0
answers
58
views
Why does `Could not execute the todo command` reappear after `git rebase --edit-todo` has been executed?
I commit a secret and now GitHub doesn't allow me to push. Following Pushing a branch blocked by push protection - GitHub Docs I use git rebase -i 9dea936~1 but I get:
fatal: invalid upstream '9dea936~...
- 2,625
0
votes
1
answer
19
views
How rebasing develop after merge on master?
On my project, when devs ask for merge of feature branches on develop, the source branch is merged, and afterwards deleted, because in the Merge Requests settings, we checked Enable "Delete ...
- 949
-3
votes
0
answers
49
views
`deleted by us` showing in interactive rebase when the file was neither deleted by us nor them
I've used interactive rebasing numerous times, but perhaps not in such a complex context as I did just now. I'm trying to correct a feature branch. This feature branch is meant to be merged to remote ...
- 9
2
votes
2
answers
87
views
What are the git commands to rebase a child-branch whose parent branch has been rebased?
This has happened multiple times where we have a devel branch on which a large feature (feature/one branch) is being worked by multiple people. Each developer branches off of feature/one and performs ...
- 10.7k
0
votes
0
answers
22
views
Maintaining stacked PRs with constant amending
My employer requires that all pull requests contain a single commit. So I often have several inflight PRs that depend on each other. Given master -> branch A -> branch B, when I need to update A,...
- 503
0
votes
1
answer
55
views
How to merge master to feature-branch only using Gitlab GUI/Web IDE?
Maybe an odd situation, but I have fiddled with this myself and searched several forums without any luck. Is this even possible without setting up a local environment and cloning the repo?
For some ...
- 181
1
vote
1
answer
33
views
Problems when rebasing because of an untracked file
I want to rebase a branch into the main branch so I do
git checkout MyAwesomeBranch
git rebase main
The problem is that I get
Using index info to reconstruct a base tree...
.git/rebase-apply/patch:68:...
- 9,123
0
votes
0
answers
29
views
Is there any reason why some would want to rebase a branch and then merge --no-ff to force a merge commit?
From what I understand, rebasing essentially moves the base of your branch to a more recent (the most recent?) commit to make it seem like you branched off later than you actually did.
This makes it ...
- 1,100
1
vote
1
answer
52
views
Confused about Git merge with multiple branches. How can I merge the changes made in a branch created from an existing Pull Request branch? [duplicate]
I had a project where I had to make some changes.
I created a first Pull Request:
git checkout -b v1
This PR is waiting to be reviewed and approved by my team lead.
Meanwhile, I had to open a second ...
- 11
-1
votes
1
answer
66
views
Losing files and changes once doing rebase with GIT
My branch is way too behind the main development branch and I want to add these changes to my feature branch
I have rebased my feature branch to main development and I can only see other team changes, ...
- 354
-1
votes
1
answer
39
views
CONFLICT after rebase when file deleted in remote branch (master)
I have a branch that needs to be rebased onto master since there is a change in master. Basically, one of the header files has been deleted and some of its contents moved to another unit (split ...
- 1
1
vote
1
answer
105
views
Git Rebase Hell
I have a repo. It is a little bit chaotic...
I can let it be as is and just go on using proper flow from now on, but...
Can I at least fix some commit messages and keep old branches for history?)
It ...
- 23
0
votes
2
answers
75
views
Pull and rebase from master in same time
I want to optimize the following process:
branch A> checkout master
master > git pull
master > checkout branch A
branch A> git rebase master
Is it possible to do these commands in one ...
- 117
1
vote
1
answer
121
views
Git equivalent to Mercurial's 'hg evolve'
Let's say I have multiple commits, like this:
---A---B---C---D
\
E---F---G
\
H
Now let's say I amend a change to B, creating commit B'
...
- 33