StackOverflow Questions for Tag: rebase

Manishearth
Manishearth

Reputation: 16198

Rebase a branch without checking it out

Score: 92

Views: 23530

Answers: 5

Read More
Raja
Raja

Reputation: 161

Can I use git pull --rebase instead of "git stash git pull git stash pop"?

Score: 16

Views: 11327

Answers: 5

Read More
bsethi24
bsethi24

Reputation: 99

After merge to master, rebase with master giving conflicts for all files merged to master

Score: 0

Views: 96

Answers: 2

Read More
Daraan
Daraan

Reputation: 3947

Keep handled conflicts when rebasing a repository including complete non-linear history

Score: -2

Views: 109

Answers: 1

Read More
Spring E. Thing
Spring E. Thing

Reputation: 171

How can I rebase a Git branch as though a file was never changed?

Score: -2

Views: 43

Answers: 2

Read More
xormapmap
xormapmap

Reputation: 49

Keep branch structure during git rebase

Score: -1

Views: 59

Answers: 1

Read More
Kevin2566
Kevin2566

Reputation: 451

Git rebase to squash commits reverts local to several commits prior

Score: 1

Views: 99

Answers: 1

Read More
markdorison
markdorison

Reputation: 149074

How do I squash my last N commits together?

Score: 5685

Views: 4353008

Answers: 47

Read More
Rachel Nicolas
Rachel Nicolas

Reputation: 1165

GitLab says merge conflicts must be resolved but there are no conflicts

Score: 0

Views: 4681

Answers: 2

Read More
Jez
Jez

Reputation: 30073

Resolving a 'both added' merge conflict in git?

Score: 173

Views: 107618

Answers: 3

Read More
antoninhrlt
antoninhrlt

Reputation: 43

Change the git commit author's email but keep the same commit timestamps

Score: 1

Views: 2417

Answers: 2

Read More
Viacheslav Kondratiuk
Viacheslav Kondratiuk

Reputation: 8889

What git commit practice is better?

Score: 10

Views: 1794

Answers: 2

Read More
ewok
ewok

Reputation: 21493

git rebase: fixup commits but use latest message

Score: 7

Views: 2958

Answers: 4

Read More
packoman
packoman

Reputation: 1282

How to rebase a git branch that contains a merge commit *and* corresponding, previous branch-point

Score: 1

Views: 38

Answers: 1

Read More
minitauros
minitauros

Reputation: 2030

Git: Why does rebase result in conflicts while merge does not?

Score: 39

Views: 8768

Answers: 3

Read More
webmat
webmat

Reputation: 60636

Undoing a git rebase

Score: 4413

Views: 2247495

Answers: 21

Read More
SeekanDestroy
SeekanDestroy

Reputation: 611

Rebase and Deployment in GH Actions

Score: 1

Views: 26

Answers: 0

Read More
Michael
Michael

Reputation: 12072

Change first commit of project with Git?

Score: 653

Views: 204864

Answers: 4

Read More
Nourless
Nourless

Reputation: 854

git merge changes after previous merge

Score: 0

Views: 65

Answers: 3

Read More
codeforester
codeforester

Reputation: 43039

Squash gone wrong, how to revert to origin branch?

Score: 0

Views: 32

Answers: 0

Read More
PreviousPage 1Next