Thread
#getting-started
    s

    some-crayon-90964

    1 year ago
    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

    bumpy-keyboard-50565

    1 year ago
    Which part? Frontend or Backend? We did make some big structure changes in the backend that we announced in our last town hall.
    s

    some-crayon-90964

    1 year ago
    Yes backend I think. Just wondering if there is any suggestion on code merging.
    m

    microscopic-receptionist-23548

    1 year ago
    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

    bumpy-keyboard-50565

    1 year ago
    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

    microscopic-receptionist-23548

    1 year ago
    Presumably though, that stuff didn't need to be forked
    b

    bumpy-keyboard-50565

    1 year ago
    Maybe you can provide a diff for us to take a look
    m

    microscopic-receptionist-23548

    1 year ago
    I'm curious, where are you getting conflicts? Can you give a few example files? (just file names is fine)
    s

    some-crayon-90964

    1 year ago
    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

    microscopic-receptionist-23548

    1 year ago
    @witty-hydrogen-79411 @breezy-forest-52817
    b

    bumpy-keyboard-50565

    1 year ago
    I believe FE also went through some refactoring. You can safely delete any files that are no longer tracked.
    m

    microscopic-receptionist-23548

    1 year ago
    per Brendan those aren't conflicts; they're missing file build errors
    s

    some-crayon-90964

    1 year ago
    Maybe some files are deleted on your side but not on mine
    and it merged
    b

    bumpy-keyboard-50565

    1 year ago
    Potentially. An actual diff will help here.