If your data diverged at one site (old site receiving new content) and your code diverged on another (staging site in development) then you don’t really have a conflict here. You can just update live site with new code, assuming things are reasonably compatible.
In general WP is not friendly to bi–directional move of content. Usually workflows presume that content only ever moves in one direction (production to development, staging to production) and never in reverse. That saves one from a lot of trouble.
Related Posts:
- Hook for post and page load
- Custom Posts on Different Pages
- Display “Post 2 of 4” on single post page?
- Making pages also serve as taxonomies? Or give full pages to taxonomies?
- Trying to edit the single page from a Custom Post
- How i can add ‘N’ page of ‘N’ pages under posts loop?
- Allow non-logged in users to see a future post after clicking on a list of future posts
- No Permission to add new Page, Post or CPT with Admin role
- Including link to custom post type in ‘wp_list_pages’ function
- Multiple pages per post (not pagination)
- Can I change my post type to anything and my site still work?
- Display an authors post on a single page only when they are logged in
- How to set the mainpage of a custom post type?
- Render a Post or Page using the correct file
- Am I mixing up the concept of posts pages and categories?
- How to setup different permlalinks for posts and pages?
- Does “Custom Post Type” can have page hierarhy option?
- Cannot save pages after migration
- One Post with different content, depending on a Page
- Cannot use pages created on WP
- Different post types arranged on one page
- How to display data with pagaination on backend?
- How to Associate Posts with Pages
- Why are my wp urls showing page not found?
- How do I hide single category post on my post page
- Page vs Custom Post Types Differences/Issues
- Storing posts from query and accessing later via AJAX call
- If post has custom field then display css-class
- Best practice for migration friendly images in posts/pages?
- Display only one post each WEEK
- List children on child post
- Restrict custom post type from appearing with ?post_types=
- Show custom post type filtered by category
- create parent post using wp_insert_post
- Turn on and off custom post type from admin?
- Missing Posts in Custom Taxonomy List
- Display random posts, but omit the post it is on?
- How do I do this with WordPress? Taxonomies?
- Disable block with taxonomies at post page
- I would like to have different styles for my posts based on the content of each post
- How can i add thumbnails images to particular post (using code not admin pannel) in wordpress
- Showing posts from different categories and from custom post type
- Get latest 3 posts from multiple CPT in one query
- Which post does a taxonomy term belongs to?
- List custom taxonomy specific to one custom post type
- Post image in WordPress not appearing on home page
- Exclude pages in archives results
- How to add a custom-post-type post within another custom-post-type post edit screen using AJAX?
- Meta query for custom post type ignored in main query
- Changing custom type name hides the posts
- Display Ad on Specific Categories
- Make parts of your wordpress website completely built with data from external APIs?
- Hiding posts by other users and non-logged in
- Update Post Meta for a logged in user
- Add custom field to Posts and sort by it
- Add custom post type settings to wordress default posts
- Trouble with CPT Child 404
- Database to page routing API?
- Get related posts of child term of custom post type
- Two Custom Post Types Many to Many Relationship
- Problem with displaying posts in the CPT category
- JS innerhtml changing style when using AJAX
- Show titles, date of all posts on single category page
- Assign same parrent Page to pages AND custom post types
- Side effects of Script and Iframe in post
- Allow Static Page Load Dynamic Child Pages
- How to change the post type a theme shows by default?
- Set a checkmark in a category based on a URL-parameter
- Several post types on WP Query by tag and taxonomy
- Update postmeta Parent when post_status child change
- custom post type category count shortcode
- Portfolio Page for Classic Posts
- Add post location with mile radius allowing search
- Get the category from custom post type
- Is it possible to store Custom Post Type data in separate set of tables and still have wp_post class functionality?
- Set up post page like JAMA articles
- Custom Post Slug same as Parents Category Slug
- Shortcode not working with post counter
- Static page determines as home, but it is not
- Changing default ‘posts’ parameters with register_post_type_args
- Admin Column does not populate with data
- How to integrate a form (Ninja Form or Contact Form 7) with Custom Post Types?
- Prioritize posts in query by meta keys?
- Homepage’s content is dependent on the custom field values (set automatically), how do I get homepage to update without manually updating page?
- Show Custom Post Type meta boxes only on Page Edit
- Why does my content disapear when I make a page to match an archive name?
- How to use Custom Page Templates for hierarchical Custom Post Type
- Allow users to create posts without logging in?
- How to get all tags of a custom post type by id
- How to define which register_post_status goes to which register_post_type?
- Load Next Posts With AJAX not working with custom post type
- Limit the post for differents custom post type in the same wp_query
- 2 Different Custom Post Types in Submenu
- How to assign classes to all elements?
- Top Level pages in wordpress giving 404, but child pages working fine
- How can I show 1 featured post in a styled element, and the next few below differently styled
- Page for custom post type
- Some posts from custom post type to subdomains
- How can i create an custom post template for an specific post category? [closed]
- Why does not this wp_redirect work in is_single()?