How to commit and push if we have not pull in the code from remote repo

Question

0.00/5 (No votes)

See more:

I forgot to pull the project code from remote repo. Now I have modified the code. I want to commit and push it to remote repo.

But my friends have also modified the code in the same branch. Now how to handle this situation.
I have commited the code locally. I know there will be a merge conflict when I will push and pull.

What I have tried:

git add myfile
git commit -m "my_commit"

Posted 27-Jun-19 8:53am

hamid18

Updated 28-Jun-19 2:09am

Add a Solution

Comments

[no name] 27-Jun-19 16:58pm

Live and learn. Better document it for "next time".

1 solution

Add a Solution

Add your solution here

Treat my content as plain text, not as HTML

Preview 0

…

Existing Members

Sign in to your account

...or Join us

Download, Vote, Comment, Publish.

Your Email
Password
Forgot your password?

Your Email
This email is in use. Do you need your password?
Optional Password

I have read and agree to the Terms of Service and Privacy Policy
Please subscribe me to the CodeProject newsletters

When answering a question please:

Read the question carefully.
Understand that English isn't everyone's first language so be lenient of bad spelling and grammar.
If a question is poorly phrased then either ask for clarification, ignore it, or edit the question and fix the problem. Insults are not welcome.
Don't tell someone to read the manual. Chances are they have and don't get it. Provide an answer or move on to the next question.

Let's work to help developers, not make them feel stupid.

This content, along with any associated source code and files, is licensed under The Code Project Open License (CPOL)

CHill60 · Accepted Answer · 2019-06-28T02:10:00

Quote:
I know there will be a merge conflict when I will push and pull.

Then resolve that conflict!

Because you didn't follow the correct procedure you just have to do the work manually instead.

1. Take a full backup of your code somewhere. Renaming the project might also be a good idea but shouldn't be necessary.

2. Pull the code from the remote repository

3. Compare each files against your backup copy and reapply your changes - there are several free tools available to do this e.g. Notepad++[^] or FC - How to Use FC (File Compare) from the Windows Command Prompt[^]

4. Do your unit testing etc then commit your changes

5. Discard your backup copy

6. Take heed of the advice from @salty06 in the comment and the posting guidelines for this forum.