I've updated my branch from master and have gotten a series of merge
errors.
Normally I would just adjust the code and re-commit, but I am unsure about
how to go about the ones in the following situation:
# both modified: /js/foundation6.init.js <--this is updated in
master. I want to override mine with theirs.
# deleted by us: /sass/new.scss <--this is the real .scss file.
I want to keep this. I did'nt delete it because I've never had it on my
branch.
# both modified: _content.scss <--this is what I actually
modified. I can fix the code in this fine
# both modified: src/gulp/configs/framework-index.js <--this is
updated in master. I want to override mine with theirs.
With foundation6.init.js and framework-index.js I've never touched these
and don't want to mess around with the code inside. I am happy for Master
to overide whatever is on my branch.
With content.scss Its the only file I actually modified and I can resolve
the merge conflict myself.
With main.scss I don't know why it was deleted. I've never had it on my
branch, but want to include it.
Can someone tell me what I would need to do to get the desired outcome?
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
