search

umgc / umgc.idea.tracker.ui

This is where your nodeJS stuff will go
0 stars 0 forks source link

Development ephrem #2

Closed ekefle closed 3 years ago

ekefle commented 3 years ago

Updated status field

de137 commented 3 years ago

Good job making a pull request for this. Those conflicts need to be resolved though. If you rebase the branch on your local on top of origin/main you will get a list of files that have conflicts. Resolve the conflicts in the files and push here again and you should be good.

Quick question though? I think the target of this PR should be development, not main. Changing thY might solve the conflicts.

BereketTamrat commented 3 years ago

Thank you, Dustin. Yes, the target should have been development, we selected main by mistake.

From: Dustin Emerson notifications@github.com Sent: Wednesday, October 21, 2020 2:36 AM To: umgc/umgc.idea.tracker.ui umgc.idea.tracker.ui@noreply.github.com Cc: Bereket Tamrat btamrat@student.umgc.edu; State change state_change@noreply.github.com Subject: Re: [umgc/umgc.idea.tracker.ui] Development ephrem (#2)

Good job making a pull request for this. Those conflicts need to be resolved though. If you rebase the branch on your local on top of origin/main you will get a list of files that have conflicts. Resolve the conflicts in the files and push here again and you should be good.

Quick question though? I think the target of this PR should be development, not main. Changing thY might solve the conflicts.

— You are receiving this because you modified the open/close state. Reply to this email directly, view it on GitHubhttps://nam03.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fumgc%2Fumgc.idea.tracker.ui%2Fpull%2F2%23issuecomment-713343766&data=04%7C01%7Cbtamrat%40student.umgc.edu%7Cfbcf5cf1e9d54a349ed208d8758ba131%7C704ce3d6a4bf4e098516d52840c9f7a9%7C0%7C0%7C637388589869264729%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=5HmB72AueHwLEx3wInw6KNLvrnXTtr2veu3zNnKeTlE%3D&reserved=0, or unsubscribehttps://nam03.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fnotifications%2Funsubscribe-auth%2FAQYIAXXPODB6H65KPEBAHITSLZ6ONANCNFSM4SZCKXEA&data=04%7C01%7Cbtamrat%40student.umgc.edu%7Cfbcf5cf1e9d54a349ed208d8758ba131%7C704ce3d6a4bf4e098516d52840c9f7a9%7C0%7C0%7C637388589869274727%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=dRUgmylzA1A1ud5c%2F1iIOPMgUQ%2F0zTeULowJ09Dy4YM%3D&reserved=0.

umgc-capstone-bot commented 3 years ago

Can;t Merge,