Skip to main content

Return to Question

include information from comments to make it clear that "git pull" was configured to do a rebase
Source Link
mkrieger1
mkrieger1
  • 24.2k
  • 7
  • 68
  • 84

I pulled from origin main, and I'm having issues handling conflicts on my branch.

I did the following

git checkout test (name of my branch) git pull origin main

It tells me I have conflicts and is asking me to fix conflicts and call git rebase --continue or git rebase --abort.

I get the following error:

Auto-merging .circleci/config.yml
CONFLICT (content): Merge conflict in .circleci/config.yml
error: could not apply 2b7a15bfe61b... fix

I did the following

git checkout --ours .circleci/config.yml git add .circleci/config.yml git rebase --continue

but I keep getting this error:

Auto-merging .circleci/config.yml
CONFLICT (content): Merge conflict in .circleci/config.yml
error: could not apply 62df6154b7da... fix

and the cycle continues.

What can I do? I'm in rebase hell

I pulled from origin main, and I'm having issues handling conflicts on my branch.

I did the following

git checkout test (name of my branch) git pull origin main

It tells me I have conflicts.

I get the following error:

Auto-merging .circleci/config.yml
CONFLICT (content): Merge conflict in .circleci/config.yml
error: could not apply 2b7a15bfe61b... fix

I did the following

git checkout --ours .circleci/config.yml git add .circleci/config.yml git rebase --continue

but I keep getting this error:

Auto-merging .circleci/config.yml
CONFLICT (content): Merge conflict in .circleci/config.yml
error: could not apply 62df6154b7da... fix

and the cycle continues.

What can I do? I'm in rebase hell

I pulled from origin main, and I'm having issues handling conflicts on my branch.

I did the following

git checkout test (name of my branch) git pull origin main

It tells me I have conflicts and is asking me to fix conflicts and call git rebase --continue or git rebase --abort.

I get the following error:

Auto-merging .circleci/config.yml
CONFLICT (content): Merge conflict in .circleci/config.yml
error: could not apply 2b7a15bfe61b... fix

I did the following

git checkout --ours .circleci/config.yml git add .circleci/config.yml git rebase --continue

but I keep getting this error:

Auto-merging .circleci/config.yml
CONFLICT (content): Merge conflict in .circleci/config.yml
error: could not apply 62df6154b7da... fix

and the cycle continues.

What can I do? I'm in rebase hell

edited title
Link
mkrieger1
mkrieger1
  • 24.2k
  • 7
  • 68
  • 84

Doing git rebase returns this error Why does "git rebase" continue to conflict after choosing the "- why-ours" version of a file the first time?

deleted 19 characters in body; edited title
Source Link
marc_s
marc_s
  • 759.9k
  • 186
  • 1.4k
  • 1.5k

Doing git rebase returns an erorrthis error - why?

I pulled from origin main, and I'm having issues handling conflicts on my branch.

I did the following

git checkout test (name of my branch) git pull origin main

It tells me I have conflicts.

I get the following error:

Auto-merging .circleci/config.yml CONFLICT (content): Merge conflict in .circleci/config.yml error: could not apply 2b7a15bfe61b... fix

Auto-merging .circleci/config.yml
CONFLICT (content): Merge conflict in .circleci/config.yml
error: could not apply 2b7a15bfe61b... fix

I did the following

git checkout --ours .circleci/config.yml git add .circleci/config.yml git rebase --continue

but it keeps gives me the followingI keep getting this error:

Auto-merging .circleci/config.yml CONFLICT (content): Merge conflict in .circleci/config.yml error: could not apply 62df6154b7da... fix

Auto-merging .circleci/config.yml
CONFLICT (content): Merge conflict in .circleci/config.yml
error: could not apply 62df6154b7da... fix

and the cycle continues.

What can I do? I'm in rebase hell

Doing git rebase returns an erorr?

I pulled from origin main, and I'm having issues handling conflicts on my branch.

I did the following

git checkout test (name of my branch) git pull origin main

It tells me I have conflicts

I get the following error

Auto-merging .circleci/config.yml CONFLICT (content): Merge conflict in .circleci/config.yml error: could not apply 2b7a15bfe61b... fix

I did the following

git checkout --ours .circleci/config.yml git add .circleci/config.yml git rebase --continue

but it keeps gives me the following error

Auto-merging .circleci/config.yml CONFLICT (content): Merge conflict in .circleci/config.yml error: could not apply 62df6154b7da... fix

and the cycle continues.

What can I do? I'm in rebase hell

Doing git rebase returns this error - why?

I pulled from origin main, and I'm having issues handling conflicts on my branch.

I did the following

git checkout test (name of my branch) git pull origin main

It tells me I have conflicts.

I get the following error:

Auto-merging .circleci/config.yml
CONFLICT (content): Merge conflict in .circleci/config.yml
error: could not apply 2b7a15bfe61b... fix

I did the following

git checkout --ours .circleci/config.yml git add .circleci/config.yml git rebase --continue

but I keep getting this error:

Auto-merging .circleci/config.yml
CONFLICT (content): Merge conflict in .circleci/config.yml
error: could not apply 62df6154b7da... fix

and the cycle continues.

What can I do? I'm in rebase hell

Source Link
Rue Vitale
Rue Vitale
  • 2k
  • 4
  • 20
  • 31