https://datahubproject.io logo
Join Slack
Powered by
Is there any recommended strategies to merge code ...
# getting-started
s
Is there any recommended strategies to merge code from linkedln team? My team is experiencing some difficulties merging recent code due to a huge structural changes.
b
Which part? Frontend or Backend? We did make some big structure changes in the backend that we announced in our last town hall.
s
Yes backend I think. Just wondering if there is any suggestion on code merging.
m
If we deleted a file, just accept it as deleted. Many files moved to a new repo and are now published to bintray as jars for consumption.
b
We moved a lot of backend stuff to a separate repo: https://github.com/linkedin/datahub-gma I suspect the merge conflicts are mostly due to this and can be easily dropped (unless modified).
m
Presumably though, that stuff didn't need to be forked
b
Maybe you can provide a diff for us to take a look
m
I'm curious, where are you getting conflicts? Can you give a few example files? (just file names is fine)
s
Now I am able to resolve the conflicts, but getting some errors when building. Actually the errors are on front-end. I am seeing alot of module cannot find issue.
m
@witty-hydrogen-79411 @breezy-forest-52817
b
I believe FE also went through some refactoring. You can safely delete any files that are no longer tracked.
m
per Brendan those aren't conflicts; they're missing file build errors
s
Maybe some files are deleted on your side but not on mine
and it merged
b
Potentially. An actual diff will help here.
Open in Slack
PreviousNext
Powered by