GIT Waddo innawathaa?

[NJack]

Kollane mehema scenario ekak thiyanwa

1. Branches 3k thiyanawa, main, mybranch, featurebranch
2. Man main eken code eka clone karala gaththe
3. My branch eke man code set ekak karala thiyenne
4. featurebranch eketh wenama changes tikak karala thiyenne
5. Mata one My branch ekata mage changes walat mokuth nowenna feature branch eke changes tika ganna

ekata me steps tika ok neda?


Mage changes tika aran thiyanawa
git console(mybranch)
git stash


Latest code changes tika gannawa
git console(mybranch)
git pull origin featurebranch

Mage changes tika aye udata gannawa
git console(mybranch)
git stash pop


Git stash gahanna kalin mage code eka push karala inna oneda, mybranch ekata?

 

[Jack_Sparrow]

Current changes commit karala nattam stash karala ganna puluwan

git stash (meken passe git status ekak gahuwoth current changes nati wenawa)
git checkout mybranch
git stash pop
dan git status ekak gahuwoth changes tika tiyanawa aluth branch eke

Changes remote repo eke tiyanawanam wenama pull karaganna

 

[NJack]

Current changes commit karala nattam stash karala ganna puluwan

git stash (meken passe git status ekak gahuwoth current changes nati wenawa)
git checkout mybranch
git stash pop
dan git status ekak gahuwoth changes tika tiyanawa aluth branch eke

Changes remote repo eke tiyanawanam wenama pull karaganna

mekata meka shape neda?
git pull origin featurebranch

 

[kolavari]

yes, uba kiylaa thiyena widiha hari..

stash karanna oneth naa,,changes ekama files nemei nam kelinma merge karala danna puluwan ne

 

[hodakolla]

BUMPER