search

FuelLabs / .github

Apache License 2.0
3 stars 4 forks source link

Assist Syd with Git merge issue #3

Closed BossHog1313 closed 1 year ago

BossHog1313 commented 1 year ago

Syd encountered a nasty merge issue when pushing/merging a branch created from a branch. Ugh.

BossHog1313 commented 1 year ago

I located several articles that might help. I ran into this exact issue several years ago; Stack Overflow was my friend, and I'm trying to locate the exact article I used.

In the meantime, Syd used a workaround to get himself going.

We might want to consider using git-flow for our Git workflows.