which git commands should i choose to synchronize only one row?

Question

i am a cs student and i have got a question from my homework

A and B work on the same module. A works on A-Branch, B works on B-Branch.

A Branch:

a = 1

b = 2

//Number of cats

c = 1

//Number of dogs

d = 42

B Branch:

a = 1

b = 2

//Number of cats

c = 2

//Number of dogs

d = 42

B wants to apply this setting in 4th row("c=2" ->"c=1") to his file. But he just wants to take only this row, not the whole file or other files. what should A und B do?

IMHO stackoverflow isn't the place to ask your homework questions — tourist, Jun 12 '18 at 19:54
Agreeing with @naveenmarri on this. As this question isn't related to real-world programming, it doesn't belong here. — Michael C., Jun 12 '18 at 19:55
i am just honest to tell my situation. but thank your advice — lee, Jun 12 '18 at 20:22
@lee This can help you https://stackoverflow.com/questions/2474353/how-to-copy-commits-from-one-branch-to-another — tourist, Jun 12 '18 at 20:47

score 0 · Answer 1 · answered Jun 12 '18 at 19:41

0

B should commit his changes to his B-branch and ask A to pull from B-branch.

answered Jun 12 '18 at 19:41

Rajesh V

146
4

which commad then？ "git commit " will commit the whole file not the single row – lee Jun 12 '18 at 19:49
use git add -p which allows you to select hunks interactively – Rajesh V Jun 14 '18 at 09:56

which git commands should i choose to synchronize only one row?

1 Answers1