I am new to git. I'm working on a large project that has many contributors.


I've created a .scss file in a branch that has not yet been reviewed and 
merged in with master.


I need that same file in a new branch to add some code to it. I've been 
told it is not a good idea to create the same file again as Git will see 
them as 2 different files with the same name and won't necessarily merge 
them together.


What would be the correct way of dealing with this whilst waiting for it to 
be cleared in master?

-- 
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 git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to